Cosmetic/logging changes