Attempts to fix problems building on <0.10.