Changes to allow 1.9 build