Fix  and  to build for included platforms