Fixes to work properly with EVB.