Fixes for #563 https://github.com/MvvmCross/MvvmCross/issues/563
Missed from last commit for #563