Several updates and fixes for the data beans.