Minor bug fixes.
Temporarily added FA to plugin to avoid breaking content since it's gone in core.