Cleanup and fix for torquebox install