More Derspit fixes