Add small enhancements to fwk