fix config handlers