Corrections and fixes...

Three small commits fixing small issues ...