AT-37: Small improvements.