Made some hotfixes