misc small tweakages