A few type checker fixes