Fixing paths and other things

See if this fixes it.