Some fixes about composite attributes