A few changes to support Pair's quirky installation