Bug fixes and handle demands-attention