Performance and reliability improvements