More hotfixes and stuff
Deploy fix