Move ViewModelObservable to a built-in property
Fix up build breaks