Headless fixes