some Gonville fixes