Some small changes before the big branch