Fix merge conflicts from the dependent classes going into master

I forgot master merged in three of my commits today, whoops.