Minor fixes

Minor fixes before releasing 1.2