Fix member function calling etc.