Tweaks to recent changes by Tej and Derek