11e9ddf misc fixups