Xdebug cleanup and trivial features