device q fixes