additional fixes related to new names and statuses