[Users] Fixed: toolkit compiles on Mac OS X Catalina