Correct one type issues