Fixed deferred loading, need some fixes