Fixing paths and other minor issues