Fixup: Several small fixes.