Hotfixes for renamer