Fix from mvvm
More fixes
Shared projects are a pain in the ass