docker-related fixes