Fixes #149
Fixes #151
Fixes #150
Merge branch 'fixes/core' into develop