Fix minor problems introduced by the merge