Small bug fixes.