Fixes in raport model