Fixups after QA