Fix up more partial issues