Tweaked some things in preparation for upcoming changes