Bug fixes to use of shuffle