Fix everything up (Thanks to Rob + Fabrik Team!!)