Changed the Utils and CommonLogic global stuff to be a bit more robust