Fixed all the Platform issues