Cleanup of some minor mistakes.