Initial changes to make it work locally (on Windows)