Corrections and fixes...

Two small commits fixing small issues ...