some smallish fixes