SWF-2241 : Fix logs