Fixes after integration testing