Fixes for OBS