More fixes on #643