Fixes for Notice messages