Compilation fixes after 2.6.36 merge
Update to 2.6.36.4