A number of changes to get client/server rendering working