Fixed resolveClass calls