Fixing platform conversion, step 2 (also more tests to be added on step 3)