Compile fixes under Buildyard for current Equalizer