[TW349] - More warning fixes