Fixing post merge errors.