Minor fixes for previous commit