minor SinkReply changes, forestry compat