Minor fixes related to #575