Bagfixes for OSS