Minor fixes - 010