Code updates for gcc warnings