Paths and autoloading fix