Updates for Android fixes