Add type-findings by @charlespeters