Fix two issues with the autoload collection class