Fixes from Graeme