Lots more stuff versioned, android target