sunit: fixed issues reported by Judy