Some fixes to reflect that it is no longer just iOS