Fix autoload problem potentially
Merge from fixing autoload
Merge with Quang