Various changes to keep up with master