Fixes for xdebug