Slight changes on logging