Bug fixes for better responsiveness