Final Android fixes