Fixed some attribute stuff