Fix some Android fallout