Fix quality warnings