Bug fixes for Q7