Multiple hotfixes and payment stuff