Fix auxillary functions.