fixes for workshop;