FIX improved log messages