Make Android a bit better