Fix config for ci, headless cleanup