Android specific fixes and conditional loads