Little bug fixes.