Various fixes according to service logs.