Fix static calls to non-static methods