Setup for next version (and fixes for util for RPM)