Fixes in srmls handling, add data integrity checks
inc paths