Mvp fixes

Maybe rename here as well.