Performance fixes
Performance fixes