Small bug fixes.
