fix type noticed by @jvasileff
fix mistakes noticed by @combinatorylogic
Merge branch 'master' into destructure2