Fix to constants and readConfig