Another round of random fixes post-5.6.