Some fwk improvements