Prepare for future fix for consequent start request

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Move setting socket mode a bit higher

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>