Committing some minor fixes.