Fixes for static content