Fixes oves code & UI upgrade