Some comilation fixes