Minor improvements and updates supported by latest teapot version.