Merge: Fix misc warnings