MVP-823, MVP-822, MVP-819 - fixes