Fixes after changing constants