Fixups and preparations