Fix CHECKPATCH warnings