Merge pull request #1640 from dnltz/WIP/dnltz/parts_fixups

Minor fixups for #1627