Minor fixups before merge