A couple more fixes.