[rapoarte] fixes for 18