A few changes to fix compilation.