More logs, more fixes