Just fixing stuff after a bit of some refectoring.