Fixed OBS build issues