Fixes for OSv