Added fixes based on REF: #1837