Add autoload flags, just in case