Add fixes from #1329