Fixes for new Swift version;
Merge branch 'hotfix/1.2.1'