* Update/resolve code fragments which are tagged FIXME