Couple of bug fixes.