Fixes + coverage.