A few fixes to make it work for the taco real environment