Updates to be less verbose in non debug mode