Fixed git and rigrr plugin issues