Asset manager fixes