Various fixes for next version