Pushing some minor fixes.