Fix a few autoloader issues