Windows Look and Feel Mac Fixups

.. fixes the Mac build
.. Windows still crashes