Fix object constants