small fixes after hot changes