Multiple improvements to make old binary compatible/not crappy with new changes