Fix logging and partially revert ubw fix to maybe actually fix it?