Minor bugfixes. Fixes #1, fixes #2.

Signed-off-by: Mike Burke <mike@livioconnect.com>
Merge branch 'refs/heads/origin/hotfix' into sdl_android_parent/hotfix
Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/develop