some further fixups