fixes for workshop