Yet more bug fixing