Resolved a bunch of errors from the last commit.

See title.