fixed some autoload issues