Fixes

Attributes etc