Some minor condition fixes
Merge branch 'development' of github.com:unwired/unwiredsplash into development