Fix autoloader issues