Updated to support more advanced fossil versions without breaking things