A couple of more fixes.