smallish fixes