- small fixes after manual merge
- small fixes after manual merge

cmattoon/solarium,basdenooijer/solarium,cmattoon/solarium,basdenooijer/solarium,simgroep/solarium,chadicus/solarium,keesschepers/solarium,keesschepers/solarium,shieldo/solarium,bpolaszek/solarium