Multi-platform build support
More build updates