Fixed issues with comments component