Fixes (resulting from integration testing).