Fix a few issues with the refactored autoloader