Some old hotfixes