Fix up some commentproject stuff