Some unlisted fixes
Merge branch 'master' of https://github.com/webnull/panthera