Include changes to work on iOS