Some changes I needed to make to get the runipy working properly