Refactor type errors a bit