LPS-35446 Quick fixes