#3 - iOS related bug fixes