fix up types