Changes to beets core