various fixups