(Android Phoenix) Clean up two warnings