Couple more small fixes.