Fixes to outputLocation