mmanuelsd's patches