Fixes for FF19.