Patch fixes, part I.