Try to fix autoloading stuff