Fix wayland client interaction

A removal would be preferrable.