Fix config and eti