Some more Halloween tweaks