Hotfixes for various helper methods and packages