Update/resolve code fragments which are tagged FIXME
Revisit timeouts when fetching header data from the network