Add prefab changes

These got left out of commit 925d730