Minor fixes for kernel 3.2