Add finals where it makes sense