Minor fixes - touch ups