Fixing previous' commits failures, now it compiles alright after a git clean -fdx