Fixes + WIP on platforms updates