Start fixing some of the support routines.