ae update (Windows and OS X fixes)