Fixed up attributes a bit.