Fixes for android / x86