Hotfixes prod (wrong)

Redundant `self` detected.<br>Surrounding space missing for operator '='.<br>Surrounding space missing for operator '?'.