Minor changes so the code compiles for an Android target.