Marconi Server Fixed (Some more fixing to be done soon...)