Fixes for 2.1

Ahhh, love it! :+1: