Multiple fixes including cosmetic improvements