Fixing some vars