More beta 4 changes