Fix platform dependencies
Fix platform dependencies