Hotfixes all around.