A couple more small fixes.