Initial fixups