Feature dependencies fixed