Fixed some issues that I didn't catch the last time I merged.