Add a few prefix-related bits