Minor fixes - Build 1.3.1