Make output configurable
Fix bug when not using a proxy