Fix a whole whack of compile errors.