Improve coverage and minor fixes