Android fixes etc