Fix class calls.