Some bugfixes for EN picks