Added some hotfix functions