fix minor issues as raised by Jason