Fixes related to magopian's review (2)