More ido and autoloading tweaks