Fixed some issues with the new stocks