various fixes in utility classes