Some more fixes for activity comment