small fixes after functional tests result