Fixed optimizer and webserver call