Fix constants across classes