Oscarfv improvements