OSS fixes and adaptations