Pkg2: some tweaks I've had lying around forever.