More minor fixes in 61f96ae