fixes for bringup raw3-5