Fix compilation after previous two commits

a3f26019 and 3ef0ba5a introduced some compilation problems due to Git and myself having a disagreement.