Merge code fixes for hotfix v0.1.1