Adding fixes suggested in issue #180