Fix some dumb errors introduced in d0f666352