Fixed two issues preventing Barberry installation.