Minor fixes to the previous commit