Portugal workshop fixes