FIxed issues back into windows build. which creeped in due to linux changes.