Fix helper classes.