Hotfixes for last commit.