Patched in DavidS changes to fix up the preview modes