Improve coverage a bit more