Minor updates to utility classes