Small changes to help running locally
Small changes to make it easier to run locally