LPS-48728 Fix starting issues