Fix some bugs that appeared post FF26.