Minor fixes for 2.6.32 kernel.