Fixes in SWID entity support