small optimizations
Merge branch 'crypto' of git.mobileinno.com:pclsync into crypto