Fixes for XDebug plugin