More fixes in Typers.scala