More fixmes for untested code