Some more 1.7.10 prep work