Add fixes, mostly from Jacob Carlborg and Artur Skawina