Fixing some path problems?