Fixup comments