LPS-36535 Use constants instead of -1