Fixing small issues.