Improved logging on 1.1.1