Fixed issues with comments