Reverted a couple of changes and fixed a mistake.
Now building properly.