Fixes - Windows clone