Xdebug and composer fixes