Fixed compile bugs introduced when my last patch was merged with master.