Little improvements. Coverall fix try