Fixing some small inconsistencies reported by Dmitri Shuralyov