Fix matrix services