Make this build against more modern things