Quick buildfix. Last commit was meant to go on a WIP branch but meh :)