more autoload tweaks