static method call fixes