Several fixes over .2 version