Fixed type primitive type issues