Merge: Kill warnings