Mining fixes