Fixes to work on FF25.