ChainGuy fixes