Fixes for john's comments