Minor fixes to previous