Improved descriptions and work-arounds