Corrections after suggestions on previous commit