Fixes in attributes repository