Fix utility functions.