Additional assesrts and fixes