fix platform defined issues
fix platform defined issues