Added some changes to try and make xdebug work.