some work-related fixes