Small bug-fixes.