Minor cleanup that I forgot to commit
Merge branch 'master' of github.com:psas/av3-fc