fixes from dexter crossover