fixes for static