More fixes related to #1180