Add missing annotations and toString, the latter to improve readability of logs