Pre-forking update

Signed-off-by: Tony Green <tgreen@bandcamp.tv>