T/S LHW & Late bugs fix