Make some tweaks so it doesn't have to default to stderr