Immutability fixes

Stronger immutability guarantees with readonly fields