Also some minor cleanup of some fb* variables and functions, which were remnants of the old fireball2 name Fixes #4021