hotfix/2.0.3

Contains hotfixes