Small tweaks and FA version bump