Attempt to fix platform issues