fixes after functional testing