Merging George's review comments fixes