Minor things to get ready for another few branches