iOS bug fixes
Merge pull request #942 from stowellm/goat

iOS bug fixes