Add more trace logging, no functional changes