[RZUtils] Fix circular dependency issues