Formatting cleanup
Fix build when not buiding wayland support
Fix wayland build