Some smallish fixes