more fixes to port to dictionary config