Fix minor platform dependency
Minor fixes