Hopefully fixed autoloading now