Mostly just hotfixes