A bunch of somewhat broken changes!