Small fixes to get successful compilation.