Missing Mali related changes and config