Small improvements on MVP