Mvp fixes