Jet another set of random fixes