Fix two bogs