Fix static methods