small fixes to Darren's last commit