More minor fixes for type inference