Add a couple of autoloads