Updated paths and other misc fixes.