Minor bug fixes.
Merge branch 'iOS' of https://github.com/BehindtheCurtain/AVALANCHE into iOS