Bug fixes - params with integers / comparison-assignment mismatch