Corrections to get first build & test pass after repo migration