Small fixes to address comments #2