resolve qa issues in maintenance area