Fixing some issues.