LPS-35446 Quick Fixes