More staticfile tweaks