Fixed FLApi references and signatures