Add a close button to the non-headerbar preferences dialog
Squash a warning