Fix some {Name,Attribute}Errors