Make sure we're running McKinley .8
Added changes from @BEGamache