Fixes to minor issues.