Modifications so that we can run in current directory.