General fixes

Following eg. log more closely.