Controller log bugfixes