Compilation warning fixes