Performance and stability improvements