Fixing various QA warnings