Constant issues fixed