Possibly another fix needed for #1 and #2 windows related errors