Tweaks due to Headstart dev