Some little bug fixes.