More fixes
More fixes related to post/comment