Ammended raspberry specific bugs