Fixing some small issues.