More fixes related to #8