oss: fix compile issues