LPS-43043 Fix other issues and fix also other plugins