Performance tuning fixups
Performance tuning fixups