Wayland input follow up

Had missed amending the fixes from rebasing. Also addressed an dependency naming issue that was raised.