Additional fixes for Wayland

Additional fixes as discussed.