OSS improvments