Fixes to some imports after credentials change