Fixed the outstanding errors with the util classes