Fixed more bugs related to transition from Coach-Packet repo to RSFormPlugin repo