MVE: Style fixes