Fixes for changes in Silex.