LPS-47464 Fix other places