Fixes for things pointed by Araq on the PR
Fixes for things pointed by Araq on the PR

mbaulch/Nim,dom96/Nim,zachaysan/Nim,mbaulch/Nim,dom96/Nim,jfhg/Nim,zachaysan/Nim,russpowers/Nim,dom96/Nim,tulayang/Nim,russpowers/Nim,haiodo/Nim,mbaulch/Nim,zachaysan/Nim,haiodo/Nim,singularperturbation/Nim,dom96/Nim,dom96/Nim,haiodo/Nim,tulayang/Nim,russpowers/Nim,singularperturbation/Nim,zachaysan/Nim,jfhg/Nim,russpowers/Nim,tulayang/Nim,russpowers/Nim,zachaysan/Nim,jfhg/Nim,haiodo/Nim,zachaysan/Nim,tulayang/Nim,singularperturbation/Nim,jfhg/Nim,haiodo/Nim,haiodo/Nim,russpowers/Nim,jfhg/Nim,singularperturbation/Nim,mbaulch/Nim,zachaysan/Nim,russpowers/Nim,singularperturbation/Nim,mbaulch/Nim,tulayang/Nim,dom96/Nim,mbaulch/Nim,tulayang/Nim,jfhg/Nim,dom96/Nim,jfhg/Nim,mbaulch/Nim,haiodo/Nim,singularperturbation/Nim,singularperturbation/Nim