fixes for static methods