Small fixes to address comments