Framework Sync

Updated various classes to keep in sync with the framework changes, and
fixed small errors.