Nothing great here, already made in an earlier commit
Fixes merge errors