Fix resolveClass calls