Fixes for Michael's comments