Fixes for bare_metal with two eth