Fix Static Method Calls