erlang master build fixes