Additional logging and tweaks