More object ref error fixes