Fixed minor bugs for windows machines and mac machines