Fix constants to work correctly in all places