Changes from PR437 and more