Some fixes here and there. :collision: