Configs and minor fix