Try and fix some administrator related crashes...