Fix import after moving util wrappers