Minor logging changes
Minor fixes