Update/cleanup for Mac and win