Fix autoload and bootstrap