Fixed a couple of AT fields