Some more updates to try to get this stuff to work on tequila