Fix class & instance methods