more constants fixing