nvm fixes for x