Did some more Derby specific changes