Add fixes by @02strich.