Minor debugging updates