Minute fixes to previous version