diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index cf90182e6..95dc2396b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,8 @@
 7.5.13
  - fixed: Unable to template user profile viewing and editing screens.
  - fixed: Product Variants not saving SKU
+ - fixed: Asset Manager breaks when an asset is locked
+ - fixed: Asset Manager is slow to load
 
 7.5.12
  - skipping this release
diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm
index 01b502562..e28a8f997 100644
--- a/lib/WebGUI/Content/AssetManager.pm
+++ b/lib/WebGUI/Content/AssetManager.pm
@@ -286,7 +286,7 @@ sub www_ajaxGetManagerPage {
             revisionDate    => $asset->get( "revisionDate" ),
             childCount      => $asset->getChildCount,
             assetSize       => $asset->get( 'assetSize' ),
-            lockedBy        => $asset->lockedBy,
+            lockedBy        => $asset->get( 'isLockedBy' ),
             canEditIfLocked => $asset->canEditIfLocked,
         );
 
@@ -375,13 +375,11 @@ sub www_manage {
     $session->style->setLink( $session->url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
     $session->style->setLink( $session->url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
     $session->style->setLink( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
-    $session->style->setScript( $session->url->extras( 'yui/build/yahoo/yahoo.js' ) );
-    $session->style->setScript( $session->url->extras( 'yui/build/dom/dom.js' ) );
-    $session->style->setScript( $session->url->extras( 'yui/build/event/event.js' ) );
+    $session->style->setScript( $session->url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ) );
     $session->style->setScript( $session->url->extras( 'yui/build/element/element-beta-min.js ' ) );
     $session->style->setScript( $session->url->extras( 'yui/build/connection/connection-min.js ' ) );
-    $session->style->setScript( $session->url->extras( 'yui/build/datasource/datasource-beta.js ' ) );
-    $session->style->setScript( $session->url->extras( 'yui/build/datatable/datatable-beta.js ' ) );
+    $session->style->setScript( $session->url->extras( 'yui/build/datasource/datasource-beta-min.js ' ) );
+    $session->style->setScript( $session->url->extras( 'yui/build/datatable/datatable-beta-min.js ' ) );
     $session->style->setScript( $session->url->extras( 'yui/build/container/container-min.js' ) );
     $session->style->setScript( $session->url->extras( 'yui/build/menu/menu-min.js' ) );
     $session->style->setScript( $session->url->extras( 'yui-webgui/build/assetManager/assetManager.js' ) );