Updates to ensure site works on both Windows and Mac