Performance and compatibility improvements