Minor fixes in 61f96ae