Fix some more compile errors.