Updated mixed references to appropriate types