A few touches, less logging too