Fix add asset on empty list, other fixes