fix shifty type issues