Some tweaks to allow things to work in both Cloud9 and locally