Various fix and prepare next release