Fixes for last changes after live debugging