Type checker fixes.