Various changes which unbreak rotation