Initial Android fixes