Minor fixups and test