Cold commit, some small stuff.