Fix utility classes