More fixes for pull 1679