Fix some log issues