A few little bug fixes.