Small bug fixes.
Small bug fixes.