LPS-50604 Fix broken things