Android fixes

Let's see what breaks now!