More wibbly-wobbley-timey-wimey changes