More static file fixes