Fix fails + improve verbosing