Fix wayland client interaction

(Would result in more readable code ... at least for me)