Fixes to prefixing code

Change-Id: I5edf8eeab6b2723e3c29467796803af90528da54