fix constant issues