Close #450 - errors from our backport