Fixes and checks for SUS Inspector integration