Fixing linux build errors.

Linux compiles cleanly now.