Performance and behavior improvements