Fixed some errors and warnings left over from the previous raw input commit.