Yet more Deide fixes