Fixed type issues