fixing things that broke in 2.2