Fix a bunch of errors due to minor method signature changes, still a work in progress.