Added workaround fixing some of errors revealed by Troia-Integration-Tests.