Another bunch of compilation warning fixes