Minor cleanup (added some missing readonly's)