Performance and fixes