Mode: Android compile fixes