post workshop fixes