Fixups for initial release