Fixup comments?