Some insufients fixes