Minor fixes - v1.1.1