fixes for change to internal property