Fixed issues following testflight #100 feedback.