Couple little bug fixes.