Improving logging a bit in the STS