Fixes after functional testing