Fixes to comments