modifications to fix autoloading errors