kazuto's patches for the groovy app manager.