Final preparations for next version