Bug fixes for new field