Fix for some issues in Asset