A few more pointless fixes.