Several fixes for assembled data support