Handle default working directories a bit better