Minor changes and fixes

Cosmetic mainly