Picks

Quick fixes made on 2.1. Note: elk upgrade isn't working on multiple items for upgrade from 2.1-dev, it works from <2.0. Disregard bit is one of them.