Fixed a couple little things in BaseViewModel