Minor fixes to issues caused by the autoload intitial implemenation.