More core option fixes