Fixes after last merge.

Git's automatic conflict resolution dropped them.

Reviewed by: Sergio Correia