[UAA] fix issue with CONFIG_DIR
[UAA] midnight fixes