tweaks for core and boot changes