Make Compound slightly more robust