Fixes to comments form