Fixed User Attributes and some other stuff