Made mac fixes not interfere with Windows