Fix a couple of issues with commenting