Some fixes for "static"