Changed some defaults and not in debug mode