Fix config and data load