Fix for crash on Lollipop 64-bit
Remove warnings
Merge pull request #739 from bhariharan/unstable

Fix for crash on Lollipop 64-bit