Changes for generic workshop and use on Windows machines