Fixing path and a few other things