Fixes for current Siena and PHP versions