Several fixxes including datatables