
          Fixes, some thanks to ASan

73a3e9d