More Android fixes

Still quite a bit of broken compilation