Fix some more errors
Final proprietary fix
Merge pull request #3 from Carbon-Xperia/master

Fix some more errors