fix a couple "initialization skipped by goto" and other new errors.
Attach a file by drag & drop or click to upload
