MInor fixes