Changes to allow building on multiple versions