Bug fixes and performance issues