Added some stuff to the hotfix branch