FOAD updates

Assorted fixes and minor updates.