1) Add limit 2) Upgrade Optiq to 0.8-SNAPSHOT