Fixing merge errors.

Merging in definitions as needed in order to get a complete compile.