Two smallish fixes