Removed xdebug warnings