Fixed, plus a couple others in this file.