Fixes for php version