OZF-185: Fixing errors