fixes #3048, fixes #3047
fixes #3048, fixes #3047

fredericksilva/Nim,JCavallo/Nim,haiodo/Nim,msmith491/Nim,zachaysan/Nim,nafsaka/Nim,fredericksilva/Nim,Salafit/Nim,JCavallo/Nim,Salafit/Nim,mbaulch/Nim,Salafit/Nim,tmm1/Nim,mbaulch/Nim,sarvex/Nim-lang,singularperturbation/Nim,msmith491/Nim,russpowers/Nim,dom96/Nim,judofyr/Nim,judofyr/Nim,xland/Nim,judofyr/Nim,judofyr/Nim,fredericksilva/Nim,greyanubis/Nim,Dhertz/Nim,Dhertz/Nim,nafsaka/Nim,tmm1/Nim,fredericksilva/Nim,xland/Nim,dom96/Nim,haiodo/Nim,bvssvni/Nim,mbaulch/Nim,endragor/Nim,JCavallo/Nim,tmm1/Nim,jfhg/Nim,judofyr/Nim,sferik/Nim,nanoant/Nim,Senketsu/Nim,douglas-larocca/Nim,nimLuckyBull/Nim,singularperturbation/Nim,jfhg/Nim,judofyr/Nim,endragor/Nim,sarvex/Nim-lang,russpowers/Nim,judofyr/Nim,JCavallo/Nim,greyanubis/Nim,xland/Nim,sferik/Nim,mbaulch/Nim,douglas-larocca/Nim,Salafit/Nim,Senketsu/Nim,jsanjuas/Nim,nimLuckyBull/Nim,xland/Nim,sferik/Nim,russpowers/Nim,tmm1/Nim,Dhertz/Nim,singularperturbation/Nim,nafsaka/Nim,Matt14916/Nim,nanoant/Nim,greyanubis/Nim,sferik/Nim,tulayang/Nim,tulayang/Nim,tulayang/Nim,msmith491/Nim,msmith491/Nim,greyanubis/Nim,fredericksilva/Nim,russpowers/Nim,singularperturbation/Nim,Matt14916/Nim,zachaysan/Nim,mbaulch/Nim,tulayang/Nim,dom96/Nim,jfhg/Nim,tulayang/Nim,xland/Nim,haiodo/Nim,zachaysan/Nim,sarvex/Nim-lang,jsanjuas/Nim,nimLuckyBull/Nim,haiodo/Nim,sferik/Nim,JCavallo/Nim,JCavallo/Nim,judofyr/Nim,bvssvni/Nim,douglas-larocca/Nim,Matt14916/Nim,nafsaka/Nim,jsanjuas/Nim,Dhertz/Nim,zachaysan/Nim,jsanjuas/Nim,russpowers/Nim,fredericksilva/Nim,jsanjuas/Nim,douglas-larocca/Nim,haiodo/Nim,Matt14916/Nim,fredericksilva/Nim,dom96/Nim,bvssvni/Nim,endragor/Nim,tmm1/Nim,russpowers/Nim,zachaysan/Nim,haiodo/Nim,sarvex/Nim-lang,jfhg/Nim,nanoant/Nim,singularperturbation/Nim,endragor/Nim,greyanubis/Nim,fredericksilva/Nim,Senketsu/Nim,mbaulch/Nim,singularperturbation/Nim,zachaysan/Nim,endragor/Nim,msmith491/Nim,tulayang/Nim,nanoant/Nim,sferik/Nim,jsanjuas/Nim,nafsaka/Nim,nimLuckyBull/Nim,Senketsu/Nim,xland/Nim,greyanubis/Nim,dom96/Nim,JCavallo/Nim,bvssvni/Nim,nimLuckyBull/Nim,Senketsu/Nim,nimLuckyBull/Nim,nanoant/Nim,Salafit/Nim,jfhg/Nim,jfhg/Nim,tmm1/Nim,Matt14916/Nim,msmith491/Nim,sferik/Nim,nafsaka/Nim,Senketsu/Nim,Dhertz/Nim,singularperturbation/Nim,msmith491/Nim,russpowers/Nim,bvssvni/Nim,Dhertz/Nim,xland/Nim,zachaysan/Nim,greyanubis/Nim,tmm1/Nim,sarvex/Nim-lang,dom96/Nim,nanoant/Nim,nafsaka/Nim,sferik/Nim,Dhertz/Nim,nanoant/Nim,dom96/Nim,mbaulch/Nim,jfhg/Nim,douglas-larocca/Nim,Salafit/Nim,jsanjuas/Nim,Matt14916/Nim,bvssvni/Nim,sarvex/Nim-lang,douglas-larocca/Nim,sarvex/Nim-lang,Salafit/Nim,douglas-larocca/Nim,Senketsu/Nim,nimLuckyBull/Nim,douglas-larocca/Nim,bvssvni/Nim,endragor/Nim,endragor/Nim,Matt14916/Nim,haiodo/Nim