Small fixes caught by compiler.