finish fixes