Merge pull request #3520 from Segrain/master

Smallfix.
Removing snowflake checks for Soghun.
Merge pull request #3522 from Zuhayr/master

Removing snowflake checks for Soghun.
Postmerge mapfixes again.