Fixes to first comment activity