More fixes around #474