Bug fixes, as per email 05/12/2013