After previous fixes we can merge and move a couple
of them for easier reading.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>