Fixes variable assignment issues.